from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 23 Mar 2010 01:03:53 +0000 (10:03 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 23 Mar 2010 01:03:53 +0000 (10:03 +0900)

Trivial merge